how to resolve merge conflict in vs code

visit shbcf.ru